fix(core): 用户中断 reasoning 时丢弃未执行的工具调用 - #2471

Review: PR #2471

fix(core): 用户中断 reasoning 时丢弃未执行的工具调用

Summary

Fixes a correctness issue where user-interrupted reasoning could persist orphaned ToolUseBlock entries into the conversation history, making subsequent model calls fail due to unresolvable tool-use references.

Analysis

Root cause: The reasoning message (including any in-flight ToolUseBlock) was persisted to memory before the acting phase. If a user interrupt arrived during the window between tool-call generation and acting start, the tool call was written to state without a corresponding ToolResultBlock, leaving the conversation in an unrecoverable state.

Fix approach — correct and minimal:

1. persistInterruptedReasoningMessage() — new method that strips ToolUseBlock entries for USER interrupts while preserving text/thinking content. SYSTEM interrupts retain existing PartialReasoningPolicy semantics (unchanged).
2. Deferred persistence — moves the contextMutable().add(eventMsg) call to after checkInterrupted() in the pre-acting path, closing the race window.
3. withoutToolUseBlocks() — clean static helper that filters out tool-use blocks; returns null if nothing remains (avoiding empty message persistence).

Code quality:

• Clean separation between user and system interrupt handling
• No changes to public API or PartialReasoningPolicy contract
• Proper null handling throughout
• toList() (immutable) used correctly

Test coverage (420 lines, 7 scenarios):

• Partial streaming tool call during user interrupt
• Completed tool call before acting during user interrupt
• Text-only reasoning preserved on user interrupt
• Tool-call-only reasoning not persisted as empty message
• System interrupt with SAVE and DISCARD policies
• gotoReasoning with non-null and null reasoning messages
• Agent rebuild from interrupted state with strict history validation

All 2228 core tests pass. CI is fully green.

Verdict: Approved ✅ — well-scoped fix with thorough test coverage.

🤖 AI Review

🤖 AI Review

🤖 AI Review